From 16d413b0fa2e5e8876e7326661d321704b05b937 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 13 Feb 2021 16:44:02 +0000
Subject: [PATCH] d/rules: Show the detailed test log even if tests all succeed

When we start accepting minor differences, we'll want to know how much
the difference actually was.
---
 debian/clean | 1 +
 debian/rules | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/clean b/debian/clean
index 9ef75f24e2..5698f2ed95 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
+debian/tests-failed
 gtk/gtkdbusgenerated.c
 gtk/gtkdbusgenerated.h
diff --git a/debian/rules b/debian/rules
index 7838d90007..4fdf448233 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,6 +217,7 @@ endif
 #        (4.0.1) many failures (endianness?)
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	rm -f debian/tests-failed
 	# Mark reftests with known failures as non-fatal
 	#touch testsuite/reftests/nonresizable-size.ui.known_fail
 	#touch testsuite/reftests/window-show-contents-on-map.ui.known_fail
@@ -246,11 +247,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 		-- \
 		--setup=x11 \
 		--timeout-multiplier $(test_timeout_multiplier) \
-	|| { \
-		e=$$?; \
-		tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt; \
-		exit $$e; \
-	}
+	|| touch debian/tests-failed
+	tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt
+	if test -e debian/tests-failed; then exit 1; fi
 endif
 
 override_dh_auto_install:
-- 
2.30.2